file chooser: give GSettings schema a path

The code is always instantiating this schema at a fixed location, so why
is it relocatable?

Add a path so that it shows up properly in dconf-editor, and from the
gsettings commandline tool.

https://bugzilla.gnome.org/show_bug.cgi?id=692163

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index a1b2aa36b4d9b998d12632fd2d7bc36bccf55783..71309fd04fe4971781de709e1d76e8d31714cfbd 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6020,8 +6020,7 @@ settings_ensure (GtkFileChooserDefault *impl)
   if (impl->settings != NULL)
     return;
 
-  impl->settings = g_settings_new_with_path ("org.gtk.Settings.FileChooser",
-                                             "/org/gtk/settings/file-chooser/");
+  impl->settings = g_settings_new ("org.gtk.Settings.FileChooser");
   g_settings_delay (impl->settings);
 }
 

diff --git a/gtk/org.gtk.Settings.FileChooser.gschema.xml b/gtk/org.gtk.Settings.FileChooser.gschema.xml
index 99c356eb7a79d08767e3a1d7c2777b521332ed26..d7d87058af6cf5ce7ed40f495ddd8608d5b51ccd 100644 (file)
--- a/gtk/org.gtk.Settings.FileChooser.gschema.xml
+++ b/gtk/org.gtk.Settings.FileChooser.gschema.xml
@@ -33,7 +33,7 @@
     <value nick='descending' value='1'/>
   </enum>
 
-  <schema id='org.gtk.Settings.FileChooser'>
+  <schema id='org.gtk.Settings.FileChooser' path='/org/gtk/settings/file-chooser/'>
     <key name='last-folder-uri' type='s'>
       <default>""</default>
     </key>